From ae0ff07b57f60d787471f81e00f9cd0afdc194ef Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@hp.com>
Date: Tue, 22 Jan 2008 08:26:20 -0700
Subject: [PATCH] [IA64] Introduce dom0_vhpt_size_log2 boot option to change
 dom0 vhpt size

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 xen/arch/ia64/xen/dom0_ops.c | 16 ++--------------
 xen/arch/ia64/xen/vhpt.c     | 16 ++++++++++++++++
 xen/arch/ia64/xen/xensetup.c |  7 +++++++
 xen/include/asm-ia64/vhpt.h  |  8 ++++++++
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c
index 56c23c7e0d..85f8eaf7ee 100644
--- a/xen/arch/ia64/xen/dom0_ops.c
+++ b/xen/arch/ia64/xen/dom0_ops.c
@@ -20,6 +20,7 @@
 #include <xen/guest_access.h>
 #include <asm/vmx.h>
 #include <asm/dom_fw.h>
+#include <asm/vhpt.h>
 #include <xen/iocap.h>
 #include <xen/errno.h>
 #include <xen/nodemask.h>
@@ -121,20 +122,7 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
                     for_each_vcpu (d, v)
                         v->arch.breakimm = d->arch.breakimm;
                 }
-#ifdef CONFIG_XEN_IA64_PERVCPU_VHPT
-                if (ds->vhpt_size_log2 == -1) {
-                    d->arch.has_pervcpu_vhpt = 0;
-                    ds->vhpt_size_log2 = -1;
-                    printk(XENLOG_INFO "XEN_DOMCTL_arch_setup: "
-                           "domain %d VHPT is global.\n", d->domain_id);
-                } else {
-                    d->arch.has_pervcpu_vhpt = 1;
-                    d->arch.vhpt_size_log2 = ds->vhpt_size_log2;
-                    printk(XENLOG_INFO "XEN_DOMCTL_arch_setup: "
-                           "domain %d VHPT is per vcpu. size=2**%d\n",
-                           d->domain_id, ds->vhpt_size_log2);
-                }
-#endif
+                domain_set_vhpt_size(d, ds->vhpt_size_log2);
                 if (ds->xsi_va)
                     d->arch.shared_info_va = ds->xsi_va;
                 ret = dom_fw_setup(d, ds->bp, ds->maxmem);
diff --git a/xen/arch/ia64/xen/vhpt.c b/xen/arch/ia64/xen/vhpt.c
index aee9a833be..e5aac9aa43 100644
--- a/xen/arch/ia64/xen/vhpt.c
+++ b/xen/arch/ia64/xen/vhpt.c
@@ -153,6 +153,22 @@ void __init vhpt_init(void)
 }
 
 #ifdef CONFIG_XEN_IA64_PERVCPU_VHPT
+void
+domain_set_vhpt_size(struct domain *d, int8_t vhpt_size_log2)
+{
+	if (vhpt_size_log2 == -1) {
+		d->arch.has_pervcpu_vhpt = 0;
+		printk(XENLOG_INFO "XEN_DOMCTL_arch_setup: "
+		       "domain %d VHPT is global.\n", d->domain_id);
+	} else {
+		d->arch.has_pervcpu_vhpt = 1;
+		d->arch.vhpt_size_log2 = vhpt_size_log2;
+		printk(XENLOG_INFO "XEN_DOMCTL_arch_setup: "
+		       "domain %d VHPT is per vcpu. size=2**%d\n",
+		       d->domain_id, vhpt_size_log2);
+	}
+}
+
 int
 pervcpu_vhpt_alloc(struct vcpu *v)
 {
diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index 7673451195..ede498abab 100644
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -22,6 +22,7 @@
 #include <asm/meminit.h>
 #include <asm/page.h>
 #include <asm/setup.h>
+#include <asm/vhpt.h>
 #include <xen/string.h>
 #include <asm/vmx.h>
 #include <linux/efi.h>
@@ -329,6 +330,11 @@ is_platform_hp_ski(void)
     return 1;
 }
 
+#ifdef CONFIG_XEN_IA64_PERVCPU_VHPT
+static int __initdata dom0_vhpt_size_log2;
+integer_param("dom0_vhpt_size_log2", dom0_vhpt_size_log2);
+#endif
+
 void __init start_kernel(void)
 {
     char *cmdline;
@@ -630,6 +636,7 @@ printk("num_online_cpus=%d, max_cpus=%d\n",num_online_cpus(),max_cpus);
     dom0 = domain_create(0, 0, DOM0_SSIDREF);
     if (dom0 == NULL)
         panic("Error creating domain 0\n");
+    domain_set_vhpt_size(dom0, dom0_vhpt_size_log2);
     dom0_vcpu0 = alloc_vcpu(dom0, 0, 0);
     if (dom0_vcpu0 == NULL || vcpu_late_initialise(dom0_vcpu0) != 0)
         panic("Cannot allocate dom0 vcpu 0\n");
diff --git a/xen/include/asm-ia64/vhpt.h b/xen/include/asm-ia64/vhpt.h
index 17703d3659..54b3bd8837 100644
--- a/xen/include/asm-ia64/vhpt.h
+++ b/xen/include/asm-ia64/vhpt.h
@@ -55,8 +55,16 @@ DECLARE_PER_CPU (unsigned long, vhpt_pend);
 #endif
 
 #include <xen/sched.h>
+#ifdef CONFIG_XEN_IA64_PERVCPU_VHPT
+void domain_set_vhpt_size(struct domain *d, int8_t vhpt_size_log2);
 int pervcpu_vhpt_alloc(struct vcpu *v);
 void pervcpu_vhpt_free(struct vcpu *v);
+#else
+#define domain_set_vhpt_size(d, vhpt_size_log2) do { } while (0)
+#define pervcpu_vhpt_alloc(v)                   (0)
+#define pervcpu_vhpt_free(v)                    do { } while (0)
+#endif
+
 static inline unsigned long
 vcpu_vhpt_maddr(struct vcpu* v)
 {
-- 
2.30.2